Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 17 Mar 2011 16:32:03 +0000 (09:32 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 17 Mar 2011 16:32:03 +0000 (09:32 -0700)
commitef7e044072f9bb041166ab48d4a7818e4f1f92b2
tree9d7c2b2b704792586c24087af2efe965485e9741
parenta58630239c419dbc24a93e03360ccb7c57afa6f4
parent43f61825e3772120f5bb44f24710bd36c28bcf5c
Merge from mainline.
src/ChangeLog
src/buffer.c
src/emacs.c
src/keyboard.h
src/lisp.h
src/print.c